Move mocks to parent package to avoid import cycle #1078
Merged
+279
−281
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Is this a bug fix or adding new feature?
What is this PR about? / Why do we need it?
I would like to move the cloud mocks to pkg/cloud from pkg/driver because they belong in pkg/cloud but that results in import cycle because mock_cloud.go depends on pkg/cloud e.g. for cloud.DiskOptions. If I recall correctly they are in pkg/driver as a hack to avoid this import cycle.
It seems simplest to just get rid of the mocks package and let mocks live in same package as what they are mocking.
(This is part of some effort to reorganize pkg/cloud to be easily copyable/consumable from EFS repo, see also "Refactor pkg/cloud/metadata.go into pkg/cloud/metadata_*.go files" #1074)
What testing is done?